Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Wed, 21 Sep 2016 18:50:18 +0000 (14:50 -0400)
committerTom Rini <[email protected]>
Wed, 21 Sep 2016 18:50:18 +0000 (14:50 -0400)

Trivial merge